Merge pull request nicolasbock#107 from linxon/tmpbr1

Make it work again!

Author: nicolasbock

.gitignore

@@ -0,0 +1,4 @@
+build/
+dist/
+ebuildtester.egg-info/
+*__pycache__*

.travis.yml

@@ -2,7 +2,6 @@ language: python
 
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
 

ebuildtester/docker.py

@@ -136,11 +136,12 @@ def _reader(self, proc, stream, name):
     def _setup_container(self, docker_image):
         """Setup the container."""
 
-        import subprocess
+        if options.options.pull:
+            import subprocess
 
-        docker_args = ["docker", "pull", docker_image]
-        docker = subprocess.Popen(docker_args)
-        docker.wait()
+            docker_args = ["docker", "pull", docker_image]
+            docker = subprocess.Popen(docker_args)
+            docker.wait()
 
     def _create_container(self, docker_image, local_portage, overlays):
         """Create new container."""
@@ -152,17 +153,24 @@ def _create_container(self, docker_image, local_portage, overlays):
             "--tty",
             "--cap-add", "SYS_ADMIN",
             "--device", "/dev/fuse",
-            "--storage-opt", "size=50G",
             "--workdir", "/root",
-            "--volume", "%s:/usr/portage" % local_portage,
-            "--volume", "/usr/portage/distfiles:/usr/portage/distfiles"]
+            "--volume", "%s:/var/db/repos/gentoo" % local_portage,
+            "--volume", "%s/distfiles:/var/cache/distfiles" % local_portage,
+            "--volume", "%s/packages:/var/cache/binpkgs" % local_portage]
+
+        if options.options.storage_opt:
+            for s in options.options.storage_opt:
+                docker_args += ["--storage-opt", "%s" % s]
+
         for o in overlays:
             docker_args += ["--volume=%s:%s" % o]
+
         docker_args += [docker_image]
         options.log.info("creating docker container with: %s" %
                          " ".join(docker_args))
         docker = subprocess.Popen(docker_args, stdout=subprocess.PIPE)
         docker.wait()
+
         if docker.returncode != 0:
             raise Exception("failure creating docker container")
 
@@ -326,4 +334,4 @@ def _print_summary(self):
         self.execute("if [[ -f /etc/portage/package.use/testbuild ]]; then " +
                      "cat /etc/portage/package.use/testbuild; fi")
         self.execute("emerge --info")
-        self.execute("qlop --list")
+        self.execute("qlop")

ebuildtester/main.py

@@ -42,4 +42,4 @@ def main():
         options.log.info("opening interactive shell")
         container.shell()
 
-        container.cleanup()
+    container.cleanup()

ebuildtester/parse.py

@@ -40,8 +40,7 @@ def parse_commandline(args):
     parser.add_argument(
         "--update",
         help="Update container before installing atom",
-        choices=["yes", "true", "no", "false"],
-        default="false")
+        action="store_true")
     parser.add_argument(
         "--threads",
         metavar="N",
@@ -76,6 +75,15 @@ def parse_commandline(args):
         "--rm",
         help="Remove container after session is done",
         action="store_true")
+    parser.add_argument(
+        "--pull",
+        help="Download latest 'gentoo/stage3-amd64' docker image",
+        action="store_true")
+    parser.add_argument(
+        "--storage-opt",
+        help="Storage driver options for all volumes (same as Docker param)",
+        nargs="+",
+        action="append")
     parser.add_argument(
         "--with-X",
         help="Globally enable the X USE flag",
@@ -87,9 +95,9 @@ def parse_commandline(args):
     parser.add_argument(
         "--profile",
         help="The profile to use",
-        choices=["default/linux/amd64/17.0",
-                 "default/linux/amd64/17.0/systemd"],
-        default="default/linux/amd64/17.0")
+        choices=["default/linux/amd64/17.1",
+                 "default/linux/amd64/17.1/systemd"],
+        default="default/linux/amd64/17.1")
 
     options = parser.parse_args(args)
 

tests/test_parse.py

@@ -37,8 +37,8 @@ def test_overlay_dir(self):
 
     def test_update(self):
         options = ebuildtester.parse.parse_commandline(
-            self.args + ["--update", "yes"])
-        self.assertTrue(options.update)
+            self.args + ["--update"])
+        self.assertFalse(options.update)
 
     def test_threads(self):
         options = ebuildtester.parse.parse_commandline(