Merge pull request #553 from pjf/version_tests

Tests: Allow for -PRE in stable release numbers.
KSP-CKAN · Dec 11, 2014 · b9c866a · b9c866a
2 parents 01dc95b + cd35e0d
commit b9c866a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CKAN/Tests/CKAN/Meta.cs b/CKAN/Tests/CKAN/Meta.cs
@@ -32,11 +32,11 @@ public void ReleaseNumber()
             }
 
             // We should always be in the form v0.xx (pre-release series),
-            // or vx.x.x (released). We also permit a (-RC\d) extension for
-            // release candidates.
+            // or vx.x.x (released). We also permit a (-RC\d+) extension for
+            // release candidates, and -PRE\d for pre-releases.
 
             Assert.IsTrue(
-                Regex.IsMatch(version.ToString(), @"^v(?:0.\d+|\d+\.\d+\.\d+(?:-RC\d+)?)$"),
+                Regex.IsMatch(version.ToString(), @"^v(?:0.\d+|\d+\.\d+\.\d+(?:-(?:RC|PRE)\d+)?)$"),
                 version.ToString());
         }
     }