[Abtlinux-svn] SF.net SVN: abtlinux: [447] src/trunk

[<esc...@us...>]

Revision: 447
          http://abtlinux.svn.sourceforge.net/abtlinux/?rev=447&view=rev
Author:   eschabell
Date:     2007-12-27 11:11:11 -0800 (Thu, 27 Dec 2007)

Log Message:
-----------
Refactored unit tests and class to properly setup the frozen status of a package for the testing. Furthermore, allow automoted non-user querying build for re-install package method.

Modified Paths:
--------------
    src/trunk/abtpackagemanager.rb
    src/trunk/testabtpackagemanager.rb

Modified: src/trunk/abtpackagemanager.rb
===================================================================
--- src/trunk/abtpackagemanager.rb	2007-12-27 19:09:13 UTC (rev 446)
+++ src/trunk/abtpackagemanager.rb	2007-12-27 19:11:11 UTC (rev 447)
@@ -214,11 +214,12 @@
   # Reinstalls a given package.
   #
   # <b>PARAM</b> <i>String</i> - the name of the package to be reinstalled.
+  # <b>PARAM</b> <i>Boolean</i> - query the user if false (default), otherwise true and skip query.
   #
   # <b>RETURN</b> <i>boolean</i> - True if the package is reinstalled, 
   # otherwise false.
   ##
-  def reinstall_package( package )
+  def reinstall_package( package, automated_build=false )
     logger = Logger.new( $JOURNAL )
     # TODO: look into refactoring myLogger:
     myLogger = AbtLogManager.new
@@ -232,20 +233,23 @@
 		end
 
 		# check if already installed.
-    if ( system.package_installed( options['package'] ) )
-      puts "\n*** Package #{package} is already installed! ***\n"
-      puts "Are you sure you want to proceed with a reinstall? (y/n)"
+    if ( system.package_installed( package ) )
+
+			if !automated_build
+      	puts "\n*** Package #{package} is already installed! ***\n"
+      	puts "Are you sure you want to proceed with a reinstall? (y/n)"
       
-      while answer = STDIN.gets
-        answer.chomp!
-        if answer == "y"
-          break
-        elsif answer == "n"
-          exit
-        else 
-          puts "Are you sure you want to reinstall #{package}? (y/n)"
-        end
-      end
+      	while answer = STDIN.gets
+        	answer.chomp!
+        	if answer == "y"
+          	break
+        	elsif answer == "n"
+          	exit
+        	else 
+          	puts "Are you sure you want to reinstall #{package}? (y/n)"
+        	end
+      	end
+			end
     else
       puts "\n*** Package #{package} is not installed, we will install it for you now! ***\n"
       puts "Hit enter to continue..."

Modified: src/trunk/testabtpackagemanager.rb
===================================================================
--- src/trunk/testabtpackagemanager.rb	2007-12-27 19:09:13 UTC (rev 446)
+++ src/trunk/testabtpackagemanager.rb	2007-12-27 19:11:11 UTC (rev 447)
@@ -55,6 +55,11 @@
   ## 
   def test_install_package
     if @system.package_installed( "ipc" )
+			
+			if @system.package_frozen( "ipc" )
+				@manager.freeze_package( "ipc" )
+			end
+
       @manager.remove_package( "ipc" )
     end
     
@@ -69,7 +74,11 @@
       @manager.install_package( "ipc" )
     end
     
-    assert( @pkgMgr.reinstall_package( "ipc" ), "test_reinstall_package()" )
+		if @system.package_frozen( "ipc" )
+			@manager.freeze_package( "ipc" )
+		end
+
+    assert( @pkgMgr.reinstall_package( "ipc", true ), "test_reinstall_package()" )
   end
   
   ##
@@ -80,6 +89,10 @@
       @manager.install_package( "ipc" )
     end
       
+		if @system.package_frozen( "ipc" )
+			@manager.freeze_package( "ipc" )
+		end
+
     assert( @pkgMgr.remove_package( "ipc" ), "test_remove_package()" )
   end
   
@@ -90,6 +103,10 @@
     if !@system.package_installed( "ipc" )
       @manager.install_package( "ipc" )
     end
+
+		if @system.package_frozen( "ipc" )
+			@manager.freeze_package( "ipc" )
+		end
     
     assert( @pkgMgr.downgrade_package( "ipc", "1.2" ), "test_downgrade_package()" )
   end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.