First tests of upgrade for package installation method

edgedb · Oct 16, 2020 · 365ec94 · 365ec94
1 parent 956da07
commit 365ec94
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/tests/docker.rs b/tests/docker.rs
@@ -129,7 +129,7 @@ pub fn run_systemd(tagname: &str, script: &str)
         cg_path=$(cat /proc/self/cgroup | grep -oP '(?<=name=).*' | sed s/://)
         mkdir -p /run/user/1000 /sys/fs/cgroup/$cg_path
         chown user1 /sys/fs/cgroup/$cg_path /run/user/1000
-        sudo -H -u user1 sh -exc {script}
+        sudo -H -u user1 bash -exc {script}
     "###, script=shell_words::quote(&script));
     Command::new("docker")
         .arg("run")

diff --git a/tests/github-nightly/upgrade.rs b/tests/github-nightly/upgrade.rs
@@ -8,7 +8,6 @@ use crate::common::{dock_ubuntu, dock_centos, dock_debian};
 #[test_case("edbtest_bionic", &dock_ubuntu("bionic"))]
 #[test_case("edbtest_xenial", &dock_ubuntu("xenial"))]
 #[test_case("edbtest_focal", &dock_ubuntu("focal"))]
-#[test_case("edbtest_centos7", &dock_centos(7))]
 #[test_case("edbtest_centos8", &dock_centos(8))]
 #[test_case("edbtest_buster", &dock_debian("buster"))]
 #[test_case("edbtest_stretch", &dock_debian("stretch"))]
@@ -20,6 +19,30 @@ fn package(tagname: &str, dockerfile: &str) -> anyhow::Result<()> {
     build_image(context, tagname)?;
     run_systemd(tagname, r###"
         edgedb server install --version=1-alpha5
+        edgedb server init test1
+
+        ver1=$(edgedb -Itest1 --wait-until-available=30s --tab-separated query '
+            SELECT sys::get_version_as_str()
+        ')
+        [[ $ver1 =~ ^1\.0-alpha\.5\+ ]]
+
+        edgedb --wait-until-available=30s -Itest1 query '
+            CREATE TYPE Type1 {
+                CREATE PROPERTY prop1 -> str;
+            }
+        ' 'INSERT Type1 { prop1 := "value1" }'
+        if ! edgedb server upgrade test1 --to-version=1-alpha6; then
+            res=$?
+            journalctl -xe
+            exit $res
+        fi
+        ver2=$(edgedb -Itest1 --wait-until-available=30s --tab-separated query '
+            SELECT sys::get_version_as_str()
+        ')
+        [[ $ver2 =~ ^1\.0-alpha\.6\+ ]]
+        val=$(edgedb -Itest1 --wait-until-available=30s --tab-separated \
+              query 'SELECT Type1 { prop1 }')
+        test "$val" = "value1"
     "###).success();
     Ok(())
 }
@@ -46,12 +69,24 @@ fn docker(tagname: &str, dockerfile: &str) -> anyhow::Result<()> {
 
         edgedb server install --version=1-alpha6 --method=docker
         edgedb server init test1
+
+        ver1=$(edgedb -Itest1 --wait-until-available=30s --tab-separated query '
+            SELECT sys::get_version_as_str()
+        ')
+        [[ $ver1 =~ ^1\.0-alpha\.6\+ ]]
+
         edgedb --wait-until-available=30s -Itest1 query '
             CREATE TYPE Type1 {
                 CREATE PROPERTY prop1 -> str;
             }
         ' 'INSERT Type1 { prop1 := "value1" }'
         edgedb server upgrade test1 --to-nightly
+
+        ver2=$(edgedb -Itest1 --wait-until-available=30s --tab-separated query '
+            SELECT sys::get_version_as_str()
+        ')
+        [[ $ver2 =~ ^1.0.*\+g ]]
+
         val=$(edgedb -Itest1 --wait-until-available=30s --tab-separated \
               query 'SELECT Type1 { prop1 }')
         test "$val" = "value1"