Merge 1679d963df
into 128e9ba59f
This commit is contained in:
commit
d1ac6279ca
3 changed files with 152 additions and 21 deletions
79
Jenkinsfile
vendored
Normal file
79
Jenkinsfile
vendored
Normal file
|
@ -0,0 +1,79 @@
|
|||
pipeline{
|
||||
agent any
|
||||
stages {
|
||||
stage('env') {
|
||||
steps {
|
||||
sh 'printenv'
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build') {
|
||||
agent {
|
||||
docker {
|
||||
image 'python:3-alpine'
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh 'python -m py_compile sources/add2vals.py sources/calc.py'
|
||||
}
|
||||
}
|
||||
stage('Test') {
|
||||
|
||||
parallel {
|
||||
stage('on centos') {
|
||||
agent {
|
||||
docker {
|
||||
image 'qnib/pytest'
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py || true'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
junit 'test-reports/results.xml'
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('on debian') {
|
||||
agent {
|
||||
docker {
|
||||
image 'qnib/pytest'
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc2.py || true'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
junit 'test-reports/results.xml'
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
stage('Deliver') {
|
||||
agent {
|
||||
docker {
|
||||
image 'cdrx/pyinstaller-linux:python2'
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh 'pyinstaller --onefile sources/add2vals.py'
|
||||
input message: "Build stage finished.(click to preceded)"
|
||||
|
||||
}
|
||||
post {
|
||||
success {
|
||||
archiveArtifacts 'dist/add2vals'
|
||||
githubNotify description: 'This is a shorted example', status: 'SUCCESS'
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
|
@ -5,28 +5,30 @@ class TestCalc(unittest.TestCase):
|
|||
"""
|
||||
Test the add function from the calc library
|
||||
"""
|
||||
# def test_fail(self):
|
||||
# self.assertFalse(True, msg="This is failed test")
|
||||
|
||||
def test_add_integers(self):
|
||||
"""
|
||||
Test that the addition of two integers returns the correct total
|
||||
"""
|
||||
result = calc.add2(1, 2)
|
||||
self.assertEqual(result, 3)
|
||||
|
||||
def test_add_floats(self):
|
||||
"""
|
||||
Test that the addition of two floats returns the correct result
|
||||
"""
|
||||
result = calc.add2('10.5', 2)
|
||||
self.assertEqual(result, 12.5)
|
||||
|
||||
def test_add_strings(self):
|
||||
"""
|
||||
Test the addition of two strings returns the two strings as one
|
||||
concatenated string
|
||||
"""
|
||||
result = calc.add2('abc', 'def')
|
||||
self.assertEqual(result, 'abcdef')
|
||||
# def test_add_integers(self):
|
||||
# """
|
||||
# Test that the addition of two integers returns the correct total
|
||||
# """
|
||||
# result = calc.add2(1, 2)
|
||||
# self.assertEqual(result, 3)
|
||||
#
|
||||
# def test_add_floats(self):
|
||||
# """
|
||||
# Test that the addition of two floats returns the correct result
|
||||
# """
|
||||
# result = calc.add2('10.5', 2)
|
||||
# self.assertEqual(result, 12.5)
|
||||
#
|
||||
# def test_add_strings(self):
|
||||
# """
|
||||
# Test the addition of two strings returns the two strings as one
|
||||
# concatenated string
|
||||
# """
|
||||
# result = calc.add2('abc', 'def')
|
||||
# self.assertEqual(result, 'abcdef')
|
||||
|
||||
def test_add_string_and_integer(self):
|
||||
"""
|
||||
|
|
50
sources/test_calc2.py
Normal file
50
sources/test_calc2.py
Normal file
|
@ -0,0 +1,50 @@
|
|||
import unittest
|
||||
import calc
|
||||
|
||||
class TestCalc(unittest.TestCase):
|
||||
"""
|
||||
Test the add function from the calc library
|
||||
"""
|
||||
# def test_fail(self):
|
||||
# self.assertFalse(True, msg="This is failed test")
|
||||
|
||||
def test_add_integers(self):
|
||||
"""
|
||||
Test that the addition of two integers returns the correct total
|
||||
"""
|
||||
result = calc.add2(1, 2)
|
||||
self.assertEqual(result, 3)
|
||||
|
||||
def test_add_floats(self):
|
||||
"""
|
||||
Test that the addition of two floats returns the correct result
|
||||
"""
|
||||
result = calc.add2('10.5', 2)
|
||||
self.assertEqual(result, 12.5)
|
||||
|
||||
def test_add_strings(self):
|
||||
"""
|
||||
Test the addition of two strings returns the two strings as one
|
||||
concatenated string
|
||||
"""
|
||||
result = calc.add2('abc', 'def')
|
||||
self.assertEqual(result, 'abcdef')
|
||||
|
||||
# def test_add_string_and_integer(self):
|
||||
# """
|
||||
# Test the addition of a string and an integer returns them as one
|
||||
# concatenated string (in which the integer is converted to a string)
|
||||
# """
|
||||
# result = calc.add2('abc', 3)
|
||||
# self.assertEqual(result, 'abc3')
|
||||
#
|
||||
# def test_add_string_and_number(self):
|
||||
# """
|
||||
# Test the addition of a string and a float returns them as one
|
||||
# concatenated string (in which the float is converted to a string)
|
||||
# """
|
||||
# result = calc.add2('abc', '5.5')
|
||||
# self.assertEqual(result, 'abc5.5')
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
Loading…
Reference in a new issue