Test only the numeric part of the process version (#214)

When testing the version of the running Elasticsearch process, don't consider suffix components like "-alpha1". Fixes #213
elastic · Nov 9, 2018 · a625c8b · a625c8b
1 parent 5ae026e
commit a625c8b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/tests/constants.py b/tests/constants.py
diff --git a/tests/fixtures.py b/tests/fixtures.py
@@ -27,6 +27,7 @@ class Elasticsearch():
 
         def __init__(self):
             self.version = run('./bin/elastic-version', stdout=PIPE).stdout.decode().strip()
+            self.version_number = self.version.split('-', 1)[0]  # '7.0.0-alpha1-SNAPSHOT' -> '7.0.0'
             self.flavor = pytest.config.getoption('--image-flavor')
             self.url = 'http://localhost:9200'
 

diff --git a/tests/test_process.py b/tests/test_process.py
@@ -1,4 +1,3 @@
-from .constants import version
 from .fixtures import elasticsearch
 
 
@@ -11,5 +10,6 @@ def test_process_is_running_as_the_correct_user(elasticsearch):
 
 
 def test_process_is_running_the_correct_version(elasticsearch):
-    version_string = version.replace('-SNAPSHOT', '')
-    assert elasticsearch.get_root_page()['version']['number'] == version_string
+    running_version = elasticsearch.get_root_page()['version']['number']
+    correct_version = elasticsearch.version_number
+    assert running_version == correct_version