more fixes in tests for 9

Author: hjwp

chapter_09_docker.asciidoc

@@ -1341,13 +1341,9 @@ NOTE: If you don't see this error,
 
 ==== Should we run "migrate" inside the Dockerfile? No.
 
-// JAN: Not sure I understand this line.
-// You're saying that we shouldn't run migrate inside our Dockerfile,
-// but then in the next line you do exactly that
-
 So, should we include `manage.py migrate` in our Dockerfile?
 
-If you try it, you'll find it certainly fixes the problem:
+If you try it, you'll find it certainly _seems_ to fix the problem:
 
 [role="sourcecode"]
 .Dockerfile (ch09l008)
@@ -1365,17 +1361,23 @@ CMD python manage.py runserver 0.0.0.0:8888
 <1> We run `migrate` using the `--noinput` argument to suppress any little "are you sure" prompts.
 
 
-If we rebuild the image and try our FTs again, they all pass!
+If we rebuild the image...
+
+[subs="specialcharacters,quotes"]
+----
+$ *docker build -t superlists . && docker run -p 8888:8888 -it superlists*
+[...]
+Starting development server at http://0.0.0.0:8888/
+----
 
+...and try our FTs again, they all pass!
 
-[role="small-code"]
+[role="small-code pause-first"]
 [subs="specialcharacters,macros"]
 ----
 $ pass:quotes[*TEST_SERVER=localhost:8888 ./src/manage.py test src/functional_tests \
     --failfast*]
-Found 3 test(s).
-Creating test database for alias 'default'...
-System check identified no issues (0 silenced).
+[...]
 ...
  ---------------------------------------------------------------------
 Ran 3 tests in 26.965s
@@ -1388,20 +1390,17 @@ which is not what we want,
 because the system image is mean to be something fixed and stateless,
 whereas the database is living, stateful data that should change over time.
 
+// DAVID: This is an important point which might need a bit more explanation.
+// What would happen if we did?
 
 === Mounting files inside the container.
 
 We want the database on the server to have totally separate data from the one on our machine.
-// CSANAD: we need to list `src/db.sqlite3` in the .dockerignore file to achieve this.
-//         Otherwise, if the reader did not delete the DB, it would still end up built into
-// the image since the COPY directive copies everything that's inside `src`.
-
-// DAVID: This is an important point which might need a bit more explanation.
-// What would happen if we did?
 
 In most deployments, you'd probably be talking to a separate database server, like postgres.
 
-For the purposes of this book, the easiest analogy to a server that's "outside" our container,
+For the purposes of this book,
+the easiest analogy to a server that's "outside" our container,
 is to access the database from the filesystem outside the container.
 
 That also gives us a convenient excuse to talk about mounting files in Docker,
@@ -1478,9 +1477,7 @@ And we check the FTs again.
 ----
 $ pass:quotes[*TEST_SERVER=localhost:8888 ./src/manage.py test src/functional_tests \
     --failfast*]
-Found 3 test(s).
-Creating test database for alias 'default'...
-System check identified no issues (0 silenced).
+[...]
 ...
  ---------------------------------------------------------------------
 Ran 3 tests in 26.965s

tests/sourcetree.py

@@ -136,7 +136,7 @@ def run_command(
         if user_input and not user_input.endswith("\n"):
             user_input += "\n"
         if user_input:
-            print("sending user input: {}".format(user_input))
+            print(f"sending user input: {user_input}")
         output, _ = process.communicate(user_input)
         if process.returncode and not ignore_errors:
             if (

tests/test_chapter_09_docker.py

@@ -30,12 +30,15 @@ def test_listings_and_commands_and_output(self):
 
         # hack fast-forward
         if os.environ.get("SKIP"):
-            self.pos = 8
+            # self.pos = 8
             # self.pos = 18
+            self.pos = 60
             self.sourcetree.run_command(
-                "git checkout {}".format(self.sourcetree.get_commit_spec("ch09l001"))
+                # "git checkout {}".format(self.sourcetree.get_commit_spec("ch09l001"))
                 # "git checkout {}".format(self.sourcetree.get_commit_spec("ch09l003"))
+                "git checkout {}".format(self.sourcetree.get_commit_spec("ch09l008"))
             )
+            print(f"Running in: {self.sourcetree.tempdir}")
             # vm_restore = "MANUAL_2"
 
         if DO_SERVER_COMMANDS: