Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@sugarlabs.org>2013-05-23 03:47:20 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2013-05-23 03:47:20 (GMT)
commit0f9a19da6d7e536c5cd390e4bb96c9feeab74949 (patch)
tree4702eacb360ea53da89d5b6a4834a09846ab081f
parent261893cd31727451322aaeab41dc1dd8a730dd08 (diff)
Actualize tests
-rwxr-xr-xtests/units/client/solver.py5
-rwxr-xr-xtests/units/node/sync.py37
2 files changed, 3 insertions, 39 deletions
diff --git a/tests/units/client/solver.py b/tests/units/client/solver.py
index 62f8f28..deda1db 100755
--- a/tests/units/client/solver.py
+++ b/tests/units/client/solver.py
@@ -12,11 +12,12 @@ class SolverTest(tests.Test):
def test_select_architecture(self):
host_arch = os.uname()[-1]
+ all_arches = [i for i in solver.machine_ranks.keys() if i]
self.assertEqual(host_arch, solver.select_architecture(
- sorted(solver.machine_ranks.keys(), cmp=lambda x, y: cmp(solver.machine_ranks[x], solver.machine_ranks[y]))))
+ sorted(all_arches, cmp=lambda x, y: cmp(solver.machine_ranks[x], solver.machine_ranks[y]))))
self.assertEqual(host_arch, solver.select_architecture(
- sorted(solver.machine_ranks.keys(), cmp=lambda x, y: cmp(solver.machine_ranks[y], solver.machine_ranks[x]))))
+ sorted(all_arches, cmp=lambda x, y: cmp(solver.machine_ranks[y], solver.machine_ranks[x]))))
self.assertEqual(host_arch, solver.select_architecture([host_arch]))
self.assertEqual(host_arch, solver.select_architecture(['foo', host_arch, 'bar']))
diff --git a/tests/units/node/sync.py b/tests/units/node/sync.py
index 28f4eef..bb85dcc 100755
--- a/tests/units/node/sync.py
+++ b/tests/units/node/sync.py
@@ -294,43 +294,6 @@ class SyncTest(tests.Test):
self.assertEqual({'packet': 'last'}, json.loads(i.send(999999999)))
self.assertRaises(StopIteration, i.next)
- def test_chunked_encode(self):
- output = sync.chunked_encode([])
- self.assertEqual({'packet': 'last'}, json.loads(decode_chunked(output.read(100))))
-
- data = [{'foo': 1}, {'bar': 2}]
- data_stream = dumps({'packet': 'packet'})
- for record in data:
- data_stream += dumps(record)
- data_stream += dumps({'packet': 'last'})
-
- output = sync.chunked_encode([('packet', None, iter(data))])
- pauload = StringIO()
- while True:
- chunk = output.read(1)
- if not chunk:
- break
- pauload.write(chunk)
- self.assertEqual(data_stream, decode_chunked(pauload.getvalue()))
-
- output = sync.chunked_encode([('packet', None, iter(data))])
- pauload = StringIO()
- while True:
- chunk = output.read(2)
- if not chunk:
- break
- pauload.write(chunk)
- self.assertEqual(data_stream, decode_chunked(pauload.getvalue()))
-
- output = sync.chunked_encode([('packet', None, iter(data))])
- pauload = StringIO()
- while True:
- chunk = output.read(1000)
- if not chunk:
- break
- pauload.write(chunk)
- self.assertEqual(data_stream, decode_chunked(pauload.getvalue()))
-
def test_encode_Blobs(self):
self.assertEqual([
dumps({'packet': 1}),