Skip to content

Commit 8d6f5bf

Browse files
committed
update version checking test
1 parent 2b6772f commit 8d6f5bf

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

tests/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ git+git://github.com/saltstack/pytest-salt@master#egg=pytest-salt
66
tornado<5.0.0
77
salt
88
CherryPy
9+
setuptools_scm

tests/unit/test_init.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import imp
55
import os
66
import shutil
7-
import subprocess
7+
import setuptools_scm
88

99
# Import Pepper Libraries
1010
import pepper
@@ -15,13 +15,10 @@ def test_no_setup():
1515
shutil.move(setuppath, setuppath + '.bak')
1616
ptest = imp.load_source('ptest', os.path.join(os.path.dirname(pepper.__file__), '__init__.py'))
1717
shutil.move(setuppath + '.bak', setuppath)
18-
assert ptest.version is None
18+
assert ptest.version == setuptools_scm.get_version()
1919
assert ptest.sha is None
2020

2121

2222
def test_version():
23-
version = subprocess.check_output(['git', 'describe']).split(b'-')
24-
version = b'.'.join([version[0], b'dev' + version[1]]).decode()
25-
sha = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).strip().decode()
26-
assert pepper.version == version
27-
assert ptest.sha is None
23+
assert pepper.version == setuptools_scm.get_version()
24+
assert pepper.sha is None

0 commit comments

Comments
 (0)