Fix failing tests due to recent ACL changes

Author: mangalaman93

examples/simple/README.md

@@ -15,11 +15,11 @@ set up the Dgraph cluster:
 version: "3.2"
 services:
   zero:
-    image: dgraph/dgraph:v1.1.0
+    image: dgraph/dgraph:latest
     restart: on-failure
     command: dgraph zero --my=zero:5080
   server:
-    image: dgraph/dgraph:v1.1.0
+    image: dgraph/dgraph:latest
     ports:
       - 8080:8080
       - 9080:9080

examples/simple/requirements.txt

@@ -1 +1 @@
-pydgraph>=1.0a1.0
+pydgraph>=2.0.2

tests/helper.py

@@ -17,6 +17,7 @@
 __author__ = 'Garvit Pahal <[email protected]>'
 __maintainer__ = 'Martin Martinez Rivera <[email protected]>'
 
+import time
 import unittest
 
 import pydgraph
@@ -58,4 +59,11 @@ def setUp(self):
         """Sets up the client."""
 
         self.client = create_client(self.TEST_SERVER_ADDR)
-        self.client.login("groot", "password")
+        while True:
+            try:
+                self.client.login("groot", "password")
+                break
+            except Exception as e:
+                if not "user not found" in str(e):
+                    raise e
+            time.sleep(0.1)

tests/test_acct_upsert.py

@@ -111,6 +111,7 @@ def assert_changes(self, firsts, accounts):
 def upsert_account(addr, account, success_ctr, retry_ctr):
     """Runs upsert operation."""
     client = helper.create_client(addr)
+    client.login("groot", "password")
     query = """{{
         acct(func:eq(first, "{first}")) @filter(eq(last, "{last}") AND eq(age, {age})) {{
             uid
@@ -167,6 +168,7 @@ def upsert_account(addr, account, success_ctr, retry_ctr):
 def upsert_account_upsert_block(addr, account, success_ctr, retry_ctr):
     """Runs upsert operation."""
     client = helper.create_client(addr)
+    client.login("groot", "password")
     query = """{{
         acct(func:eq(first, "{first}")) @filter(eq(last, "{last}") AND eq(age, {age})) {{
             u as uid

tests/test_acl.py

@@ -23,7 +23,7 @@
 import unittest
 
 from . import helper
-
+import pydgraph
 
 class TestACL(helper.ClientIntegrationTestCase):
     user_id = 'alice'
@@ -68,6 +68,8 @@ def change_permission(self, permission):
         bash_command = "dgraph acl -a " + self.server_addr + " mod -g " + self.group_id + \
                        " -p name -m " + str(permission) + " -x password"
         self.run_command(bash_command)
+        # wait for ACL cache to be refreshed.
+        time.sleep(6)
 
     def insert_sample_data(self):
         txn = self.client.txn()
@@ -130,7 +132,7 @@ def try_altering(self, expected):
                 self.fail("Acl test failed: Alter successful without permission")
         except Exception as e:
             if expected:
-                self.fail("Acl test failed: Alter failed for altreble predicate.\n" + str(e))
+                self.fail("Acl test failed: Alter failed for alterable predicate.\n" + str(e))
 
 
 def suite():

tests/test_txn.py

@@ -211,6 +211,7 @@ def test_read_from_new_client(self):
         txn.commit()
 
         client2 = helper.create_client(self.TEST_SERVER_ADDR)
+        client2.login("groot", "password")
         query = """{{
             me(func: uid("{uid:s}")) {{
                 name

tests/test_type_system.py

@@ -22,7 +22,6 @@
 
 from tests import helper
 
-
 class TestTypeSystem(helper.ClientIntegrationTestCase):
     def setUp(self):
         super(TestTypeSystem, self).setUp()

tests/test_upsert_block.py

@@ -22,7 +22,6 @@
 
 from . import helper
 
-
 class TestUpsertBlock(helper.ClientIntegrationTestCase):
     """Tests for Upsert Block"""