aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christopher Baklid <[email protected]>2018-06-03 10:22:46 +0200
committerGravatar Christopher Baklid <[email protected]>2018-06-03 10:22:46 +0200
commit8dd23755ccb7d83d5d0762e18a266eae2769cbba (patch)
treee4ea3b54d8b651fdd407d17e7245f2e4a4e5464a
parentlint (diff)
consistent naming conventions, update readme, hopefully fix travis test
-rw-r--r--.travis.yml2
-rw-r--r--README.md4
-rw-r--r--docker-compose.yml8
-rw-r--r--tests/test_snekbox.py1
4 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 1c053fb..8765a5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ script:
- chmod +x scripts/ci.sh
- bash scripts/ci.sh
- pipenv run lint
- - pipenv run test
+ - sudo pipenv run test
#after_success:
# - bash scripts/deploy.sh
diff --git a/README.md b/README.md
index d0b565d..d94d477 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ rabbitmq webinterface: `http://localhost:15672`
start the webserver
```bash
-docker-compose up -d pdsnekboxweb
+docker-compose up -d pdsnkweb
netstat -plnt
# tcp 0.0.0.0:5000 LISTEN
```
@@ -105,7 +105,7 @@ netstat -plnt
```bash
pipenv run snekbox # for debugging
# or
-docker-compose up pdsnekbox # for running the container
+docker-compose up pdsnk # for running the container
```
________________________________________
diff --git a/docker-compose.yml b/docker-compose.yml
index 6605e3d..3aedf14 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,9 +13,9 @@ services:
RABBITMQ_DEFAULT_USER: guest
RABBITMQ_DEFAULT_PASS: guest
- pdsnekbox:
+ pdsnk:
privileged: true
- hostname: "pdsnekbox"
+ hostname: "pdsnk"
image: pythondiscord/snekbox:latest
networks:
- sneknet
@@ -24,8 +24,8 @@ services:
RMQ_USERNAME: guest
RMQ_PASSWORD: guest
- pdsnekboxweb:
- hostname: "pdsnekboxweb"
+ pdsnkweb:
+ hostname: "pdsnkweb"
image: pythondiscord/snekboxweb:latest
networks:
- sneknet
diff --git a/tests/test_snekbox.py b/tests/test_snekbox.py
index 5f065aa..1f48ee8 100644
--- a/tests/test_snekbox.py
+++ b/tests/test_snekbox.py
@@ -50,7 +50,6 @@ class SnekTests(unittest.TestCase):
'while 1:\n'
' os.fork()')
result = snek.python3(code)
-
self.assertIn('(PIDs left: 0)', result.strip())