Changeset 0f6d665 in trunk

Timestamp:

2019-08-24T20:26:09Z (6 years ago)

Author:

meejah <meejah@…>

Branches:

master

Children:

b6f0832

Parents:

20f907f

git-author:

meejah <meejah@…> (2019-08-24 18:53:36)

git-committer:

meejah <meejah@…> (2019-08-24 20:26:09)

Message:

fewer magic numbers (and a fix to upload encoding)

Location:

integration

Files:

• test_web.py (modified) (1 diff)
• util.py (modified) (2 diffs)

integration/test_web.py ¶

@@ -78 +78 @@
     """
 
-    FILE_CONTENTS = u"added via PUT"
+    FILE_CONTENTS = b"added via PUT" * 20
 
     resp = requests.put(
         util.node_url(alice.node_dir, u"uri"),
-        files={
-            u"file": FILE_CONTENTS,
-        },
+        data=FILE_CONTENTS,
     )
     cap = allmydata.uri.from_string(resp.text.strip().encode('ascii'))
+    cfg = alice.get_config()
     assert isinstance(cap, allmydata.uri.CHKFileURI)
-    assert cap.size == 153
-    assert cap.total_shares == 4
-    assert cap.needed_shares == 2
+    assert cap.size == len(FILE_CONTENTS)
+    assert cap.total_shares == int(cfg.get_config("client", "shares.total"))
+    assert cap.needed_shares == int(cfg.get_config("client", "shares.needed"))
 
 

integration/util.py ¶

@@ -18 +18 @@
     write_config,
 )
+from allmydata import client
 
 import pytest_twisted
@@ -164 +165 @@
     def node_dir(self):
         return self._node_dir
+
+    def get_config(self):
+        return client.read_config(
+            self._node_dir,
+            u"portnum",
+        )
 
     def __str__(self):