[152488] trunk/base/src/port1.0/tests/portutil.test

[cal at macports.org]

Revision: 152488
          https://trac.macports.org/changeset/152488
Author:   cal at macports.org
Date:     2016-09-11 03:23:57 -0700 (Sun, 11 Sep 2016)
Log Message:
-----------
base: Fix portutil default_variants test

Modified Paths:
--------------
    trunk/base/src/port1.0/tests/portutil.test

Modified: trunk/base/src/port1.0/tests/portutil.test
===================================================================
--- trunk/base/src/port1.0/tests/portutil.test	2016-09-11 07:03:35 UTC (rev 152487)
+++ trunk/base/src/port1.0/tests/portutil.test	2016-09-11 10:23:57 UTC (rev 152488)
@@ -705,19 +705,38 @@
 test handle_default_variants {
     Handle default variants unit test.
 } -body {
-    array set variations {
-        target.run org.macports.checksum
-    }
+    global PortInfo
+    global variations
 
-    set res [handle_default_variants target set {+org -org2}]
+    array set variations {}
 
-    if {[lindex $PortInfo(vinfo) 0] != "org" || [lindex $PortInfo(vinfo) 1] != "is_default +"} {
-        return "FAIL: default variant not set"
+    handle_default_variants "default_variants" "set" {+var -var2}
+
+    # Check that +var was recorded
+    array set vinfo $PortInfo(vinfo)
+    if {![info exists vinfo(var)]} {
+        return "FAIL: PortInfo(vinfo)(var) does not exist after default_variants +var"
     }
-    if {[lindex $PortInfo(vinfo) 2] != "org2" || [lindex $PortInfo(vinfo) 3] != "is_default -"} {
-        return "FAIL: nondefault variant not set"
+    array set info $vinfo(var)
+    if {![info exists info(is_default)]} {
+        return "FAIL: PortInfo(vinfo)(var)(is_default) does not exist after default_variants +var"
     }
+    if {$info(is_default) ne "+"} {
+        return "FAIL: PortInfo(vinfo)(var)(is_default) should be + but is ${info(is_default)}"
+    }
 
+    # Check that -var2 was recorded
+    if {![info exists vinfo(var2)]} {
+        return "FAIL: PortInfo(vinfo)(var2) does not exist after default_variants -var"
+    }
+    array set info $vinfo(var2)
+    if {![info exists info(is_default)]} {
+        return "FAIL: PortInfo(vinfo)(var2)(is_default) does not exist after default_variants -var2"
+    }
+    if {$info(is_default) ne "-"} {
+        return "FAIL: PortInfo(vinfo)(var2)(is_default) should be - but is ${info(is_default)}"
+    }
+
     return "Handle default variant successful."
 } -result "Handle default variant successful."
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160911/bb764fac/attachment-0001.html>