Software / code / prosody
Annotate
spec/util_queue_spec.lua @ 13801:a5d5fefb8b68 13.0
mod_tls: Enable Prosody's certificate checking for incoming s2s connections (fixes #1916) (thanks Damian, Zash)
Various options in Prosody allow control over the behaviour of the certificate
verification process For example, some deployments choose to allow falling
back to traditional "dialback" authentication (XEP-0220), while others verify
via DANE, hard-coded fingerprints, or other custom plugins.
Implementing this flexibility requires us to override OpenSSL's default
certificate verification, to allow Prosody to verify the certificate itself,
apply custom policies and make decisions based on the outcome.
To enable our custom logic, we have to suppress OpenSSL's default behaviour of
aborting the connection with a TLS alert message. With LuaSec, this can be
achieved by using the verifyext "lsec_continue" flag.
We also need to use the lsec_ignore_purpose flag, because XMPP s2s uses server
certificates as "client" certificates (for mutual TLS verification in outgoing
s2s connections).
Commit 99d2100d2918 moved these settings out of the defaults and into mod_s2s,
because we only really need these changes for s2s, and they should be opt-in,
rather than automatically applied to all TLS services we offer.
That commit was incomplete, because it only added the flags for incoming
direct TLS connections. StartTLS connections are handled by mod_tls, which was
not applying the lsec_* flags. It previously worked because they were already
in the defaults.
This resulted in incoming s2s connections with "invalid" certificates being
aborted early by OpenSSL, even if settings such as `s2s_secure_auth = false`
or DANE were present in the config.
Outgoing s2s connections inherit verify "none" from the defaults, which means
OpenSSL will receive the cert but will not terminate the connection when it is
deemed invalid. This means we don't need lsec_continue there, and we also
don't need lsec_ignore_purpose (because the remote peer is a "server").
Wondering why we can't just use verify "none" for incoming s2s? It's because
in that mode, OpenSSL won't request a certificate from the peer for incoming
connections. Setting verify "peer" is how you ask OpenSSL to request a
certificate from the client, but also what triggers its built-in verification.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 01 Apr 2025 17:26:56 +0100 |
| parent | 13558:56e112b890ea |
| rev | line source |
|---|---|
|
8236
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
1 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
2 local queue = require "util.queue"; |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
3 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
4 describe("util.queue", function() |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
5 describe("#new()", function() |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
6 it("should work", function() |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
7 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
8 do |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
9 local q = queue.new(10); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
10 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
11 assert.are.equal(q.size, 10); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
12 assert.are.equal(q:count(), 0); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
13 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
14 assert.is_true(q:push("one")); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
15 assert.is_true(q:push("two")); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
16 assert.is_true(q:push("three")); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
17 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
18 for i = 4, 10 do |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
19 assert.is_true(q:push("hello")); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
20 assert.are.equal(q:count(), i, "count is not "..i.."("..q:count()..")"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
21 end |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
22 assert.are.equal(q:push("hello"), nil, "queue overfull!"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
23 assert.are.equal(q:push("hello"), nil, "queue overfull!"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
24 assert.are.equal(q:pop(), "one", "queue item incorrect"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
25 assert.are.equal(q:pop(), "two", "queue item incorrect"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
26 assert.is_true(q:push("hello")); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
27 assert.is_true(q:push("hello")); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
28 assert.are.equal(q:pop(), "three", "queue item incorrect"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
29 assert.is_true(q:push("hello")); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
30 assert.are.equal(q:push("hello"), nil, "queue overfull!"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
31 assert.are.equal(q:push("hello"), nil, "queue overfull!"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
32 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
33 assert.are.equal(q:count(), 10, "queue count incorrect"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
34 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
35 for _ = 1, 10 do |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
36 assert.are.equal(q:pop(), "hello", "queue item incorrect"); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
37 end |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
38 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
39 assert.are.equal(q:count(), 0, "queue count incorrect"); |
|
8240
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
40 assert.are.equal(q:pop(), nil, "empty queue pops non-nil result"); |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
41 assert.are.equal(q:count(), 0, "popping empty queue affects count"); |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
42 |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
43 assert.are.equal(q:peek(), nil, "empty queue peeks non-nil result"); |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
44 assert.are.equal(q:count(), 0, "peeking empty queue affects count"); |
|
8236
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
45 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
46 assert.is_true(q:push(1)); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
47 for i = 1, 1001 do |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
48 assert.are.equal(q:pop(), i); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
49 assert.are.equal(q:count(), 0); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
50 assert.is_true(q:push(i+1)); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
51 assert.are.equal(q:count(), 1); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
52 end |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
53 assert.are.equal(q:pop(), 1002); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
54 assert.is_true(q:push(1)); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
55 for i = 1, 1000 do |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
56 assert.are.equal(q:pop(), i); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
57 assert.is_true(q:push(i+1)); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
58 end |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
59 assert.are.equal(q:pop(), 1001); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
60 assert.are.equal(q:count(), 0); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
61 end |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
62 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
63 do |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
64 -- Test queues that purge old items when pushing to a full queue |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
65 local q = queue.new(10, true); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
66 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
67 for i = 1, 10 do |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
68 q:push(i); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
69 end |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
70 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
71 assert.are.equal(q:count(), 10); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
72 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
73 assert.is_true(q:push(11)); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
74 assert.are.equal(q:count(), 10); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
75 assert.are.equal(q:pop(), 2); -- First item should have been purged |
|
8240
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
76 assert.are.equal(q:peek(), 3); |
|
8236
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
77 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
78 for i = 12, 32 do |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
79 assert.is_true(q:push(i)); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
80 end |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
81 |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
82 assert.are.equal(q:count(), 10); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
83 assert.are.equal(q:pop(), 23); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
84 end |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
85 |
|
8240
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
86 do |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
87 -- Test iterator |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
88 local q = queue.new(10, true); |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
89 |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
90 for i = 1, 10 do |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
91 q:push(i); |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
92 end |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
93 |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
94 local i = 0; |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
95 for item in q:items() do |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
96 i = i + 1; |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
97 assert.are.equal(item, i, "unexpected item returned by iterator") |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
98 end |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
99 end |
|
c803624cae3d
spec/util_queue: Add iterator and peek tests for 100% line coverage
Matthew Wild <mwild1@gmail.com>
parents:
8236
diff
changeset
|
100 |
|
8236
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
101 end); |
|
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
102 end); |
|
9901
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
103 describe("consume()", function () |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
104 it("should work", function () |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
105 local q = queue.new(10); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
106 for i = 1, 5 do |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
107 q:push(i); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
108 end |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
109 local c = 0; |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
110 for i in q:consume() do |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
111 assert(i == c + 1); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
112 assert(q:count() == (5-i)); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
113 c = i; |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
114 end |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
115 end); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
116 |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
117 it("should work even if items are pushed in the loop", function () |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
118 local q = queue.new(10); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
119 for i = 1, 5 do |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
120 q:push(i); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
121 end |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
122 local c = 0; |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
123 for i in q:consume() do |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
124 assert(i == c + 1); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
125 if c < 3 then |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
126 assert(q:count() == (5-i)); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
127 else |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
128 assert(q:count() == (6-i)); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
129 end |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
130 |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
131 c = i; |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
132 |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
133 if c == 3 then |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
134 q:push(6); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
135 end |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
136 end |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
137 assert.equal(c, 6); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
138 end); |
|
c8b75239846c
util.queue: Add 'consume()' convenience iterator
Matthew Wild <mwild1@gmail.com>
parents:
8240
diff
changeset
|
139 end); |
|
13558
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
140 describe("replace()", function () |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
141 it("should work", function () |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
142 local q = queue.new(10); |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
143 for i = 1, 5 do |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
144 q:push(i); |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
145 end |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
146 q:replace(6); |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
147 local c = 0; |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
148 for i in q:consume() do |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
149 c = c + 1; |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
150 if c > 1 then |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
151 assert.is_equal(c, i); |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
152 elseif c == 1 then |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
153 assert.is_equal(6, i); |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
154 end |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
155 end |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
156 assert.is_equal(5, c); |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
157 end); |
|
56e112b890ea
util.queue: tests: Add test for :replace() method
Matthew Wild <mwild1@gmail.com>
parents:
9901
diff
changeset
|
158 end); |
|
8236
4878e4159e12
Port tests to the `busted` test runner
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
159 end); |