labourde/simple-python-pyinstaller-app
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

feature/jenkinsfile

Browse source 
added parallel tests
This commit is contained in:
kudlaty 2018-03-21 19:13:52 +01:00
parent 707914f3ef
commit 2534a6413f
3 changed files with 106 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Jenkinsfile vendored
View file

@ -12,6 +12,9 @@ pipeline{
}
}
stage('Test') {
parallel {
stage('on centos') {
agent {
docker {
image 'qnib/pytest'
@ -26,6 +29,27 @@ pipeline{
}
}
}
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'
}
}
}
// steps {
// sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py || true'
// }
}
}
stage('Deliver') {
agent {
docker {

42
sources/test_calc.py
View file

@ -8,27 +8,27 @@ class TestCalc(unittest.TestCase):
# 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
View 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()