From: Marius Tomaschewski <mt@suse.de>
Date: Thu, 23 Feb 2006 20:39:50 +0000 (+0000)
Subject: - Updated
X-Git-Tag: BASE-SuSE-SLE-10-SP2-Branch~1941
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f2634402e394029b83178b1cdd296ca2cc92526;p=platform%2Fupstream%2Flibzypp.git

- Updated
---

diff --git a/testsuite/media/tests/media2.cc b/testsuite/media/tests/media2.cc
index a861ad0..e8ff831 100644
--- a/testsuite/media/tests/media2.cc
+++ b/testsuite/media/tests/media2.cc
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
   media::MediaId   two;
   zypp::Url        url;
 
-  url = "cd:";
+  url = "cd:/";
 
   try
   {
@@ -152,13 +152,9 @@ int main(int argc, char *argv[])
     catch(const MediaException &e)
     {
       ZYPP_CAUGHT(e);
-      DBG << "ONE: OK, EXPECTED IT (try to eject shared media)" << std::endl;
+      ERR << "ONE: HUH? Eject hasn't worked?!" << std::endl;
     }
 
-    ONE_STEP("ONE: release()")
-    mm.release(one, false);
-
-
     try {
       ONE_STEP("ONE: provideFile(/content)")
       mm.provideFile(one, Pathname("/content"));
@@ -169,17 +165,21 @@ int main(int argc, char *argv[])
       DBG << "ONE: OK, EXPECTED IT (released)" << std::endl;
     }
 
-    ONE_STEP("TWO: provideFile(/ls-lR.gz)")
-    mm.provideFile(two, Pathname("/ls-lR.gz"));
-
-    ONE_STEP("TWO: release()")
-    mm.release(two, false);
+    try {
+      ONE_STEP("TWO: provideFile(/ls-lR.gz)")
+      mm.provideFile(two, Pathname("/ls-lR.gz"));
+    }
+    catch(const MediaException &e)
+    {
+      ZYPP_CAUGHT(e);
+      DBG << "TWO: OK, EXPECTED IT (released)" << std::endl;
+    }
 
-    ONE_STEP("ONE: REATTACH IT")
-    mm.attach(one);
+    ONE_STEP("TWO: (RE)ATTACH IT")
+    mm.attach(two);
 
-    ONE_STEP("ONE: provideFile(/INDEX.gz)")
-    mm.provideFile(one, Pathname("/INDEX.gz"));
+    ONE_STEP("TWO: provideFile(/INDEX.gz)")
+    mm.provideFile(two, Pathname("/INDEX.gz"));
 
     ONE_STEP("CLEANUP")
   }