<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[145038] trunk/base/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/145038">145038</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-01-23 18:28:10 -0800 (Sat, 23 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: tests in macports1.0, package1.0:
Change hardcoded URL to an existing archive to fix immediate test failures</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10testsmacportstest">trunk/base/src/macports1.0/tests/macports.test</a></li>
<li><a href="#trunkbasesrcpackage10testsportarchivefetchtest">trunk/base/src/package1.0/tests/portarchivefetch.test</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10testsmacportstest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/macports.test (145037 => 145038)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -581,9 +581,9 @@
</span><span class="cx"> test fetch_port {
</span><span class="cx"> Fetch port unit test.
</span><span class="cx"> } -body {
</span><del>- set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
</del><ins>+ set url http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2
</ins><span class="cx"> set res [macports::fetch_port $url]
</span><del>- if {$res ne "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
</del><ins>+ if {$res ne "${pwd}/portdbpath/portdirs/db_select-0.1_3"} {
</ins><span class="cx"> return "FAIL: cannot fetch port"
</span><span class="cx"> }
</span><span class="cx"> return "Fetch port successful."
</span><span class="lines">@@ -607,9 +607,9 @@
</span><span class="cx"> } -setup {
</span><span class="cx"> close [open $pwd/local_file w+]
</span><span class="cx"> } -body {
</span><del>- set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
</del><ins>+ set url http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2
</ins><span class="cx"> set res [macports::getportdir $url]
</span><del>- set expected ${pwd}/portdbpath/portdirs/db_select-0.1_2
</del><ins>+ set expected ${pwd}/portdbpath/portdirs/db_select-0.1_3
</ins><span class="cx"> if {$res ne $expected} {
</span><span class="cx"> return "FAIL: incorrect port directory $res (expected $expected)"
</span><span class="cx"> }
</span><span class="lines">@@ -631,9 +631,9 @@
</span><span class="cx"> Get port resource path. Doesn't check for 'file' protocol.
</span><span class="cx"> } -body {
</span><span class="cx"> set macports::portdbpath $pwd/portdbpath
</span><del>- set url "http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2"
</del><ins>+ set url "http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2"
</ins><span class="cx"> set default_path $pwd/portdbpath/sources/rsync.macports.org/release/tarballs/ports/_resources
</span><del>- set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2/_resources
</del><ins>+ set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2/_resources
</ins><span class="cx">
</span><span class="cx"> if {[macports::getportresourcepath $url "" yes] ne $default_path} {
</span><span class="cx"> return "FAIL: wrong resource path"
</span></span></pre></div>
<a id="trunkbasesrcpackage10testsportarchivefetchtest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/tests/portarchivefetch.test (145037 => 145038)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> array set ::portfetch::urlmap {
</span><span class="cx"> db_select http://packages.macports.org/db_select/
</span><span class="cx"> }
</span><del>- set portarchivefetch::archivefetch_urls {db_select db_select-0.1_2.darwin_13.noarch.tbz2}
</del><ins>+ set portarchivefetch::archivefetch_urls {db_select db_select-0.1_3.darwin_14.noarch.tbz2}
</ins><span class="cx"> set target_state_fd [open $pwd/target w+]
</span><span class="cx">
</span><span class="cx"> set mport [mportopen file://.]
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> if {[catch {portarchivefetch::fetchfiles}] != 0} {
</span><span class="cx"> return "FAIL: cannot fetch archive"
</span><span class="cx"> }
</span><del>- if {[file exists ${archivefetch.fulldestpath}/db_select-0.1_2.darwin_13.noarch.tbz2]} {
</del><ins>+ if {[file exists ${archivefetch.fulldestpath}/db_select-0.1_3.darwin_14.noarch.tbz2]} {
</ins><span class="cx"> return "FAIL: unverified archive not discarded"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> if {[portarchivefetch::fetchfiles] != 0} {
</span><span class="cx"> return "FAIL: cannot fetch archive"
</span><span class="cx"> }
</span><del>- if {![file exists ${archivefetch.fulldestpath}/db_select-0.1_2.darwin_13.noarch.tbz2]} {
</del><ins>+ if {![file exists ${archivefetch.fulldestpath}/db_select-0.1_3.darwin_14.noarch.tbz2]} {
</ins><span class="cx"> return "FAIL: verified archive deleted"
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>