cleanup uncessary build dep stuff

Signed-off-by: Adam Hill <adam@diginc.us>

setup.sh

@@ -5,20 +5,26 @@
 # fix error AUDIT: Allow login in non-init namespaces
 # Credit to https://github.com/sequenceiq/docker-pam/blob/master/ubuntu-14.04/Dockerfile
 srclist="/etc/apt/sources.list"
-cat $srclist | while read line; do  
+cat $srclist | while read line; do
   srcline="$(echo $line | sed 's/deb/deb-src/')"
   echo "$srcline" >> $srclist
 done;
 
 apt-get update
 
-apt-get -y build-dep pam
-export CONFIGURE_OPTS=--disable-audit
 cd /tmp
+apt-get -s -y build-dep pam > builddeps.txt
+apt-get -y build-dep pam
+
+export CONFIGURE_OPTS=--disable-audit
 apt-get -b source pam
-dpkg -i libpam-doc*.deb libpam-modules*.deb libpam-runtime*.deb libpam0g*.deb
+#dpkg -i libpam-doc*.deb libpam-modules*.deb libpam-runtime*.deb libpam0g*.deb
+# Cleanup
+apt-get purge -y build-essential $(grep '^Inst' builddeps.txt | awk '{ print $2 }' | tr '\n' ' ')
+apt-get autoremove -y
 rm -rf /tmp/*
 
+# Install s6
 apt-get install -y curl procps
 curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
 mv /init /s6-init

test/test_bash_functions.py

@@ -1,4 +1,5 @@
 import pytest
+import time
 import re
 
 
@@ -18,7 +19,10 @@ def test_IPv6_not_True_removes_ipv6(Docker, args, expected_ipv6, expected_stdout
 
     function = Docker.run('. /bash_functions.sh ; setup_ipv4_ipv6')
     assert "Using {}".format(expected_stdout) in function.stdout
-    config = Docker.run('cat {}'.format(WEB_CONFIG)).stdout
+    if expected_stdout == 'IPv4':
+        assert 'IPv6' not in function.stdout
+    time.sleep(.25)
+    config = Docker.run('grep \'use-ipv6.pl\' {}'.format(WEB_CONFIG)).stdout
     assert (IPV6_LINE in config) == expected_ipv6
 
 

tox.ini

@@ -4,7 +4,7 @@ envlist = py27
 [testenv]
 whitelist_externals = docker
 deps = -rrequirements.txt
-# auto parallel max b/c race condition with docker fixture (I think?)
+# 2 parallel max b/c race condition with docker fixture (I think?)
 commands = docker run --rm --privileged multiarch/qemu-user-static:register --reset
            ./Dockerfile.py -v --arch amd64
            pytest -vv -n auto -k amd64 ./test/