[145038] trunk/base/src

[raimue at macports.org]

Revision: 145038
          https://trac.macports.org/changeset/145038
Author:   raimue at macports.org
Date:     2016-01-23 18:28:10 -0800 (Sat, 23 Jan 2016)
Log Message:
-----------
base: tests in macports1.0, package1.0:
Change hardcoded URL to an existing archive to fix immediate test failures

Modified Paths:
--------------
    trunk/base/src/macports1.0/tests/macports.test
    trunk/base/src/package1.0/tests/portarchivefetch.test

Modified: trunk/base/src/macports1.0/tests/macports.test
===================================================================
--- trunk/base/src/macports1.0/tests/macports.test	2016-01-24 02:04:38 UTC (rev 145037)
+++ trunk/base/src/macports1.0/tests/macports.test	2016-01-24 02:28:10 UTC (rev 145038)
@@ -581,9 +581,9 @@
 test fetch_port {
     Fetch port unit test.
 } -body {
-    set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
+    set url http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2
     set res [macports::fetch_port $url]
-    if {$res ne "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
+    if {$res ne "${pwd}/portdbpath/portdirs/db_select-0.1_3"} {
 	return "FAIL: cannot fetch port"
     }
     return "Fetch port successful."
@@ -607,9 +607,9 @@
 } -setup {
     close [open $pwd/local_file w+]
 } -body {
-    set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
+    set url http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2
     set res [macports::getportdir $url]
-    set expected ${pwd}/portdbpath/portdirs/db_select-0.1_2
+    set expected ${pwd}/portdbpath/portdirs/db_select-0.1_3
     if {$res ne $expected} {
 	    return "FAIL: incorrect port directory $res (expected $expected)"
     }
@@ -631,9 +631,9 @@
     Get port resource path. Doesn't check for 'file' protocol.
 } -body {
     set macports::portdbpath $pwd/portdbpath
-    set url "http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2"
+    set url "http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2"
     set default_path $pwd/portdbpath/sources/rsync.macports.org/release/tarballs/ports/_resources
-    set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2/_resources
+    set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2/_resources
 
     if {[macports::getportresourcepath $url "" yes] ne $default_path} {
        return "FAIL: wrong resource path"

Modified: trunk/base/src/package1.0/tests/portarchivefetch.test
===================================================================
--- trunk/base/src/package1.0/tests/portarchivefetch.test	2016-01-24 02:04:38 UTC (rev 145037)
+++ trunk/base/src/package1.0/tests/portarchivefetch.test	2016-01-24 02:28:10 UTC (rev 145038)
@@ -87,7 +87,7 @@
     array set ::portfetch::urlmap {
         db_select http://packages.macports.org/db_select/
     }
-    set portarchivefetch::archivefetch_urls {db_select db_select-0.1_2.darwin_13.noarch.tbz2}
+    set portarchivefetch::archivefetch_urls {db_select db_select-0.1_3.darwin_14.noarch.tbz2}
     set target_state_fd [open $pwd/target w+]
 
     set mport [mportopen file://.]
@@ -104,7 +104,7 @@
     if {[catch {portarchivefetch::fetchfiles}] != 0} {
         return "FAIL: cannot fetch archive"
     }
-    if {[file exists ${archivefetch.fulldestpath}/db_select-0.1_2.darwin_13.noarch.tbz2]} {
+    if {[file exists ${archivefetch.fulldestpath}/db_select-0.1_3.darwin_14.noarch.tbz2]} {
         return "FAIL: unverified archive not discarded"
     }
 
@@ -112,7 +112,7 @@
     if {[portarchivefetch::fetchfiles] != 0} {
         return "FAIL: cannot fetch archive"
     }
-    if {![file exists ${archivefetch.fulldestpath}/db_select-0.1_2.darwin_13.noarch.tbz2]} {
+    if {![file exists ${archivefetch.fulldestpath}/db_select-0.1_3.darwin_14.noarch.tbz2]} {
         return "FAIL: verified archive deleted"
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160123/0e9dae89/attachment.html>