fix tests and new test dockerfile

Author: Buck Ryan

Dockerfile

@@ -1,6 +1,6 @@
-FROM aa8y/core:python2
+FROM python:2-alpine
 
-MAINTAINER github.com/banga/powerline-shell
+MAINTAINER github.com/b-ryan/powerline-shell
 
 USER root
 RUN apk add --no-cache --update \
@@ -12,22 +12,17 @@ RUN apk add --no-cache --update \
       subversion && \
     rm -rf /var/cache/apk/*
 
-# Cache the dev requirements. Directory is set in the base image.
-WORKDIR $APP_DIR
+RUN mkdir /code
+WORKDIR /code
 COPY requirements-dev.txt .
 RUN pip install -r requirements-dev.txt && \
-    rm -rf requirements-dev.txt
+    rm requirements-dev.txt
 
-# 'USER' is set in the base image. It points to a non-root user called 'docker'.
-USER $USER
-RUN bzr whoami "$USERNAME <$USER@example.com>" && \
-    git config --global user.email "$USER@example.com" && \
-    git config --global user.name "$USERNAME"
+RUN bzr whoami "root <root@example.com>" && \
+    git config --global user.email "root@example.com" && \
+    git config --global user.name "root"
 
 COPY . ./
-USER root
-RUN ./setup.py install && \
-    chown -R $USER:$USER .
+RUN ./setup.py install
 
-USER $USER
-ENTRYPOINT ["/bin/bash"]
+ENV USER root

test.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
-
+set -eu
 docker build -t powerline-shell .
-docker run --rm -it powerline-shell -c nosetests
+docker run --rm -it powerline-shell nosetests "$@"

test/segments_test/bzr_test.py

@@ -34,7 +34,7 @@ def setUp(self):
         sh.cd("trunk")
         sh.bzr("init")
 
-        self.segment = bzr.Segment(self.powerline)
+        self.segment = bzr.Segment(self.powerline, {})
 
     def tearDown(self):
         shutil.rmtree(self.dirname)

test/segments_test/fossil_test.py

@@ -28,7 +28,7 @@ def setUp(self):
         sh.fossil("init", "test.fossil")
         sh.fossil("open", "test.fossil")
 
-        self.segment = fossil.Segment(self.powerline)
+        self.segment = fossil.Segment(self.powerline, {})
 
     def tearDown(self):
         shutil.rmtree(self.dirname)

test/segments_test/git_stash_test.py

@@ -15,7 +15,7 @@ def setUp(self):
         sh.cd(self.dirname)
         sh.git("init", ".")
 
-        self.segment = git_stash.Segment(self.powerline)
+        self.segment = git_stash.Segment(self.powerline, {})
 
     def tearDown(self):
         shutil.rmtree(self.dirname)

test/segments_test/git_test.py

@@ -19,7 +19,7 @@ def setUp(self):
         sh.cd(self.dirname)
         sh.git("init", ".")
 
-        self.segment = git.Segment(self.powerline)
+        self.segment = git.Segment(self.powerline, {})
 
     def tearDown(self):
         shutil.rmtree(self.dirname)

test/segments_test/hg_test.py

@@ -29,7 +29,7 @@ def setUp(self):
         sh.cd(self.dirname)
         sh.hg("init", ".")
 
-        self.segment = hg.Segment(self.powerline)
+        self.segment = hg.Segment(self.powerline, {})
 
     def tearDown(self):
         shutil.rmtree(self.dirname)

test/segments_test/hostname_test.py

@@ -9,7 +9,7 @@ class HostnameTest(unittest.TestCase):
     def setUp(self):
         self.powerline = mock.MagicMock()
         self.powerline.theme = Color
-        self.segment = hostname.Segment(self.powerline)
+        self.segment = hostname.Segment(self.powerline, {})
 
     def test_colorize(self):
         self.powerline.segment_conf.return_value = True

test/segments_test/uptime_test.py

@@ -19,7 +19,7 @@ class UptimeTest(unittest.TestCase):
 
     def setUp(self):
         self.powerline = mock.MagicMock()
-        self.segment = uptime.Segment(self.powerline)
+        self.segment = uptime.Segment(self.powerline, {})
 
     @mock.patch('subprocess.check_output')
     def test_all(self, check_output):