Skip to content

Commit

Permalink
included concource common package
Browse files Browse the repository at this point in the history
  • Loading branch information
fweirich committed Mar 6, 2017
1 parent e2d4618 commit 6d48bdf
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 67 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.5
COPY opt /opt
RUN apk -Uuv add groff less python3 && \
RUN apk -Uuv add groff less python3 git && \
pip3 install -r /opt/requirements.txt && \
rm /var/cache/apk/*
2 changes: 1 addition & 1 deletion opt/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jsonschema==2.6.0
git+https://github.com/cosee-concourse/concourse-common.git
Empty file.
16 changes: 0 additions & 16 deletions opt/resource/concourse_common/common.py

This file was deleted.

32 changes: 0 additions & 32 deletions opt/resource/concourse_common/test_common.py

This file was deleted.

11 changes: 2 additions & 9 deletions opt/resource/model.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
from concourse_common import common
from enum import Enum
from concourse_common import jsonutil

VERSION_JSON_NAME = 'version'


class Model:

def __init__(self):
self.payload = common.get_payload()
self.payload = jsonutil.load_payload()

def get_version_file(self):
version = self.payload['params']['version']
Expand All @@ -22,9 +21,3 @@ def get_prefix(self):
if prefix.isalpha():
return prefix
return ""


class Request(Enum):
CHECK = 1
IN = 2
OUT = 3
8 changes: 4 additions & 4 deletions opt/tests/test_input.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import unittest
import input
from unittest.mock import patch
from concourse_common import test_common
from concourse_common import testutil
import json

class TestInput(unittest.TestCase):

@patch("input.file_io")
def test_call_to_fileIO(self, mock_io):
test = "test/test"
test_common.put_stdin(json.dumps({"source": {"prefix": "test"}, "version": {"version": "1.1.0"}}))
testutil.put_stdin(json.dumps({"source": {"prefix": "test"}, "version": {"version": "1.1.0"}}))
input.execute(test)
mock_io.write_to_file.assert_any_call(test + "/default", "test_1_1_0")
mock_io.write_to_file.assert_any_call(test + "/heroku", "test-1-1-0")

def test_invalid_prefix(self):
test = "test/test"
test_common.put_stdin(json.dumps({"source": {"prefix": "tes2234"}, "version": {"version": "1.1.0"}}))
testutil.put_stdin(json.dumps({"source": {"prefix": "tes2234"}, "version": {"version": "1.1.0"}}))
self.assertEquals(input.execute(test), -1)

@patch("input.file_io")
@patch("input.json")
def test_call_to_json(self, mock_io, mock_io2):
test = "test/test"
test_common.put_stdin(json.dumps({"source": {"prefix": "test"}, "version": {"version": "1.1.0"}}))
testutil.put_stdin(json.dumps({"source": {"prefix": "test"}, "version": {"version": "1.1.0"}}))
input.execute(test)
mock_io.dumps.assert_any_call({"version": {"version": "1.1.0"}})
6 changes: 2 additions & 4 deletions opt/tests/test_out.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@

import unittest
from unittest.mock import patch
import json

import out
from concourse_common import test_common
from concourse_common import testutil


class TestInput(unittest.TestCase):

@patch("out.file_io")
@patch("out.json")
def test_json_output(self, mock_io, mock):
test_common.put_stdin(json.dumps({"source": {"prefix": "test"}, "params": {"version": "1.1.0"}}))
testutil.put_stdin(json.dumps({"source": {"prefix": "test"}, "params": {"version": "1.1.0"}}))
mock.read.return_value = "1.1.0"
out.execute("")
mock_io.dumps.assert_any_call({"version": {"version": "1.1.0"}})
Expand Down

0 comments on commit 6d48bdf

Please sign in to comment.