token attempt at getting tests working

Author: hjwp

chapter_21_server_side_debugging.asciidoc

@@ -28,13 +28,10 @@ Let's try to deploy our site.
 Along the way we'll catch an unexpected bug (that's what staging is for!),
 and then we'll have to figure out a way of managing the database on the test server:
 
-* TODO: ansible instead of fab
-
 [role="against-server small-code"]
 [subs="specialcharacters,quotes"]
 ----
 $ pass:quotes[*ansible-playbook --user=elspeth -i staging.ottg.co.uk, infra/ansible-provision.yaml -vv*]
-$ *fab deploy:[email protected]*
 
 PLAYBOOK: ansible-provision.yaml ***********************************************
 1 plays in infra/ansible-provision.yaml
@@ -47,7 +44,7 @@ Here's what happens when we run the functional tests:
 [role="small-code"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python manage.py test functional_tests*]
+$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python src/manage.py test functional_tests*]
 
 ======================================================================
 ERROR: test_logged_in_users_lists_are_saved_as_my_lists
@@ -179,7 +176,7 @@ Now if we rerun our FTs, we see a change:
 [role="small-code"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python manage.py test functional_tests*]
+$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python src/manage.py test functional_tests*]
 
 [...]
 Traceback (most recent call last):
@@ -390,7 +387,7 @@ that can actually check for logins that work, involving real emails!
 [role="small-code"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python manage.py test functional_tests.test_login*]
+$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python src/manage.py test functional_tests.test_login*]
 [...]
 OK
 ----
@@ -420,7 +417,7 @@ so the "My Lists" test fails:
 [role="skipme small-code"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python manage.py test functional_tests*]
+$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python src/manage.py test functional_tests*]
 
 ERROR: test_logged_in_users_lists_are_saved_as_my_lists
 (functional_tests.test_my_lists.MyListsTest)
@@ -511,7 +508,7 @@ and the management command prints it out at the command line. Try it out:
 [role="skipme"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*python manage.py create_session [email protected]*]
+$ pass:quotes[*python src/manage.py create_session [email protected]*]
 Unknown command: 'create_session'
 ----
 
@@ -539,7 +536,7 @@ Now it works:
 
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*python manage.py create_session [email protected]*]
+$ pass:quotes[*python src/manage.py create_session [email protected]*]
 qnslckvp2aga7tm6xuivyb0ob1akzzwl
 ----
 
@@ -739,21 +736,19 @@ break anything:
 
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*python manage.py test functional_tests.test_my_lists*]
+$ pass:quotes[*python src/manage.py test functional_tests.test_my_lists*]
 [...]
 OK
 ----
 
 
-Next, against the server.  We push our code up first:
+Next, against the server.
 
 
 [role="against-server"]
 [subs="specialcharacters,quotes"]
 ----
-$ *git push*  # you'll need to commit changes first.
-$ *cd deploy_tools*
-$ *fab deploy [email protected]*
+$ pass:quotes[*ansible-playbook --user=elspeth -i staging.ottg.co.uk, infra/ansible-provision.yaml -vv*]
 ----
 
 And now we run the test:
@@ -762,7 +757,7 @@ And now we run the test:
 [role="against-server small-code"]
 [subs=""]
 ----
-$ <strong>TEST_SERVER=staging.ottg.co.uk python manage.py test \
+$ <strong>TEST_SERVER=staging.ottg.co.uk python src/manage.py test \
  functional_tests.test_my_lists</strong>
 [...]
 [[email protected]] run:
@@ -785,7 +780,7 @@ Looking good!  We can rerun all the tests to make sure...
 [role="against-server small-code"]
 [subs=""]
 ----
-$ <strong>TEST_SERVER=staging.ottg.co.uk python manage.py test functional_tests</strong>
+$ <strong>TEST_SERVER=staging.ottg.co.uk python src/manage.py test functional_tests</strong>
 [...]
 [[email protected]] run:
 ~/sites/staging.ottg.co.uk/.venv/bin/python

tests/test_chapter_21_server_side_debugging.py

@@ -18,23 +18,22 @@ def test_listings_and_commands_and_output(self):
         self.assertEqual(self.listings[1].type, "output")
 
         # skips
-        self.skip_with_check(1, "if you haven't already")
-        self.skip_with_check(45, "commit changes first")
+        # self.skip_with_check(45, "commit changes first")
         if DO_SERVER_COMMANDS:
             self.replace_command_with_check(
                 13,
                 "EMAIL_PASSWORD=yoursekritpasswordhere",
                 "EMAIL_PASSWORD=" + os.environ["EMAIL_PASSWORD"],
             )
 
-        fab_deploy_pos = 49
-        assert "fab deploy" in self.listings[fab_deploy_pos]
+        # deploy_pos = 49
+        # assert "ansible-playbook" in self.listings[deploy_pos]
 
         # prep
         self.start_with_checkout()
         self.prep_database()
 
-        vm_restore = "FABRIC_END"
+        # vm_restore = "FABRIC_END"
 
         # hack fast-forward
         if os.environ.get("SKIP"):
@@ -43,30 +42,30 @@ def test_listings_and_commands_and_output(self):
                 "git checkout {}".format(self.sourcetree.get_commit_spec("ch17l004"))
             )
 
-        if DO_SERVER_COMMANDS:
-            subprocess.check_call(["vagrant", "snapshot", "restore", vm_restore])
+        # if DO_SERVER_COMMANDS:
+        #     subprocess.check_call(["vagrant", "snapshot", "restore", vm_restore])
 
         while self.pos < len(self.listings):
             print(self.pos)
-            if self.pos == fab_deploy_pos + 1 and DO_SERVER_COMMANDS:
-                print("hacking in code update on server")
-                self.run_server_command(
-                    "cd /home/elspeth/sites/staging.ottg.co.uk"
-                    " && git checkout chapter_21_server_side_debugging"
-                    " && git reset --hard origin/chapter_21_server_side_debugging",
-                )
-                self.run_server_command(
-                    "sudo systemctl restart gunicorn-staging.ottg.co.uk"
-                )
+            # if self.pos == deploy_pos + 1 and DO_SERVER_COMMANDS:
+            #     print("hacking in code update on server")
+            #     self.run_server_command(
+            #         "cd /home/elspeth/sites/staging.ottg.co.uk"
+            #         " && git checkout chapter_21_server_side_debugging"
+            #         " && git reset --hard origin/chapter_21_server_side_debugging",
+            #     )
+            #     self.run_server_command(
+            #         "sudo systemctl restart gunicorn-staging.ottg.co.uk"
+            #     )
             self.recognise_listing_and_process_it()
 
         self.assert_all_listings_checked(self.listings)
 
         self.sourcetree.tidy_up_after_patches()
         self.sourcetree.run_command('git add . && git commit -m"final commit ch17"')
         self.check_final_diff(ignore=["moves"])
-        if DO_SERVER_COMMANDS:
-            subprocess.check_call(["vagrant", "snapshot", "save", "SERVER_DEBUGGED"])
+        # if DO_SERVER_COMMANDS:
+        #     subprocess.check_call(["vagrant", "snapshot", "save", "SERVER_DEBUGGED"])
 
 
 if __name__ == "__main__":