tests for 21 passing, such as they are

Author: hjwp

chapter_21_server_side_debugging.asciidoc

@@ -665,16 +665,16 @@ cryptographically valid for the server:
 [source,python]
 ----
 def _get_server_env_vars(host):
-    env_lines = run(f'cat ~/sites/{host}/.env').splitlines()  #<1>
-    return dict(l.split('=') for l in env_lines if l)
+    env_lines = run(f"cat ~/sites/{host}/.env").splitlines()  # <1>
+    return dict(l.split("=") for l in env_lines if l)
 
 
 def create_session_on_server(host, email):
     manage_dot_py = _get_manage_dot_py(host)
-    with settings(host_string=f'elspeth@{host}'):
+    with settings(host_string=f"elspeth@{host}"):
         env_vars = _get_server_env_vars(host)
-        with shell_env(**env_vars):  #<2>
-            session_key = run(f'{manage_dot_py} create_session {email}')  #<3>
+        with shell_env(**env_vars):  # <2>
+            session_key = run(f"{manage_dot_py} create_session {email}")  # <3>
             return session_key.strip()
 ----
 ====
@@ -735,6 +735,7 @@ In any case, let's see if it works.  First, locally, to check that we didn't
 break anything:
 
 
+[role="dofirst-ch21l022"]
 [subs="specialcharacters,macros"]
 ----
 $ pass:quotes[*python src/manage.py test functional_tests.test_my_lists*]
@@ -833,8 +834,8 @@ Before we finish, let's update our deployment fabfile so that it can
 automatically add the `EMAIL_PASSWORD` to the _.env_ file on the server:
 
 
-[role="sourcecode dofirst-ch21l022"]
-.deploy_tools/fabfile.py (ch18l021)
+[role="sourcecode skipme"]
+.src/deploy_tools/fabfile.py (ch18l021)
 ====
 [source,python]
 ----
@@ -843,16 +844,16 @@ import os
 
 
 def _create_or_update_dotenv():
-    append('.env', 'DJANGO_DEBUG_FALSE=y')
-    append('.env', f'SITENAME={env.host}')
-    current_contents = run('cat .env')
-    if 'DJANGO_SECRET_KEY' not in current_contents:
-        new_secret = ''.join(random.SystemRandom().choices(
-            'abcdefghijklmnopqrstuvwxyz0123456789', k=50
-        ))
-        append('.env', f'DJANGO_SECRET_KEY={new_secret}')
-    email_password = os.environ['EMAIL_PASSWORD']  #<1>
-    append('.env', f'EMAIL_PASSWORD={email_password}')  #<1>
+    append(".env", "DJANGO_DEBUG_FALSE=y")
+    append(".env", f"SITENAME={env.host}")
+    current_contents = run("cat .env")
+    if "DJANGO_SECRET_KEY" not in current_contents:
+        new_secret = "".join(
+            random.SystemRandom().choices("abcdefghijklmnopqrstuvwxyz0123456789", k=50)
+        )
+        append(".env", f"DJANGO_SECRET_KEY={new_secret}")
+    email_password = os.environ["EMAIL_PASSWORD"]  # <1>
+    append(".env", f"EMAIL_PASSWORD={email_password}")  # <1>
 ----
 ====
 

source/chapter_21_server_side_debugging/superlists

@@ -62,7 +62,7 @@ def test_listings_and_commands_and_output(self):
 
         self.sourcetree.tidy_up_after_patches()
         self.sourcetree.run_command('git add . && git commit -m"final commit ch17"')
-        self.check_final_diff(ignore=["moves"])
+        self.check_final_diff(ignore=["moves", "YAHOO_PASSWORD"])
         # if DO_SERVER_COMMANDS:
         #     subprocess.check_call(["vagrant", "snapshot", "save", "SERVER_DEBUGGED"])