[111595] trunk/base/src/macports1.0/tests/macports.test

[marius at macports.org]

Revision: 111595
          https://trac.macports.org/changeset/111595
Author:   marius at macports.org
Date:     2013-09-26 11:54:09 -0700 (Thu, 26 Sep 2013)
Log Message:
-----------
macports.test: added getoption test

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

Modified: trunk/base/src/macports1.0/tests/macports.test
===================================================================
--- trunk/base/src/macports1.0/tests/macports.test	2013-09-26 18:34:04 UTC (rev 111594)
+++ trunk/base/src/macports1.0/tests/macports.test	2013-09-26 18:54:09 UTC (rev 111595)
@@ -10,6 +10,9 @@
 source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
 package require macports 1.0
 
+# clean leftovers from interrupted tests
+file delete -force $pwd/tmpdir
+
 # use custom macports.conf and sources.conf
 makeDirectory $pwd/tmpdir
 makeDirectory $pwd/tmpdir/share
@@ -44,8 +47,9 @@
 
 test mportclose {
     Mport close unit test.
+} -setup {
+    set mport [mportopen file://.]
 } -body {
-    set mport [mportopen file://.]
     if {[catch {mportclose $mport}] != 0} {
        return "FAIL: cannot run mportclose"
     }
@@ -53,6 +57,8 @@
        return "FAIL: port not closed"
     }
     return "Mport close successful."
+} -cleanup {
+    catch {mportclose $mport}
 } -result "Mport close successful."
 
 
@@ -255,8 +261,8 @@
     root
 } -setup {
     set mport [mportopen file://.]
+    set ::logenabled 1
 } -body {
-    set ::logenabled 1
     if {[catch {macports::push_log $mport}] != 0} {
        return "FAIL: cannot push log"
     }
@@ -305,16 +311,24 @@
 } -result "Binary in path successful."
 
 
-# test getoption
+test getoption {
+    Get option unit test.
+} -body {
+    set macports::test macports
+    if {[macports::getoption test] != "macports"} {
+	return "FAIL: cannot get option"
+    }
+    return "Get option successful."
+} -result "Get option successful."
 
 
 test setxcodeinfo {
     Set XCode info unit test.
 } -constraints {
     root
+} -setup {
+    unset macports::xcodeversion
 } -body {
-    unset macports::xcodeversion
-
     if {[macports::setxcodeinfo a b c] != ""} {
        return "FAIL: xcode binary not found"
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130926/dac36e7f/attachment.html>