You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/04/19 18:21:57 UTC

svn commit: r1469941 - in /incubator/ambari/trunk: ./ ambari-agent/src/main/python/ambari_agent/ ambari-agent/src/test/python/

Author: smohanty
Date: Fri Apr 19 16:21:56 2013
New Revision: 1469941

URL: http://svn.apache.org/r1469941
Log:
AMBARI-1991. Remove unused python files from ambari-agent. (smohanty)

Removed:
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/ActionResults.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/DaemonHandler.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/FileUtil.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PackageHandler.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/ProcUtil.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Runner.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/ServerStatus.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/createDaemon.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/daemon.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/machine.py
    incubator/ambari/trunk/ambari-agent/src/test/python/TestFileUtil.py
    incubator/ambari/trunk/ambari-agent/src/test/python/TestServerStatus.py
Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Controller.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Hardware.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/NetUtil.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Register.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/RepoInstaller.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StackVersionsFileHandler.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StatusCheck.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/UpgradeExecutor.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/__init__.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/hostname.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/main.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/security.py
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/shell.py
    incubator/ambari/trunk/ambari-agent/src/test/python/TestActionQueue.py
    incubator/ambari/trunk/ambari-agent/src/test/python/TestAgentActions.py

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Apr 19 16:21:56 2013
@@ -774,6 +774,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1991. Remove unused python files from ambari-agent. (smohanty)
+
  AMBARI-1984. WebHCat log and pid dirs configs should be under WebHCat >
  Advanced. (yusaku)
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/ActionQueue.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/ActionQueue.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/ActionQueue.py Fri Apr 19 16:21:56 2013
@@ -20,26 +20,21 @@ limitations under the License.
 
 import logging
 import traceback
-import logging.handlers
 import Queue
 import threading
-import AmbariConfig
-from LiveStatus import LiveStatus
-from shell import shellRunner
-from FileUtil import writeFile, createStructure, deleteStructure, getFilePath, appendToFile
-import json
 import pprint
 import os
 import time
-import subprocess
-import copy
+
+from LiveStatus import LiveStatus
+from shell import shellRunner
 import PuppetExecutor
 import UpgradeExecutor
 import PythonExecutor
-import tempfile
 from Grep import Grep
 from ActualConfigHandler import ActualConfigHandler
 
+
 logger = logging.getLogger()
 installScriptHash = -1
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py Fri Apr 19 16:21:56 2013
@@ -18,8 +18,6 @@ See the License for the specific languag
 limitations under the License.
 '''
 
-import logging
-import logging.handlers
 import ConfigParser
 import StringIO
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Controller.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Controller.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Controller.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Controller.py Fri Apr 19 16:21:56 2013
@@ -19,28 +19,24 @@ limitations under the License.
 '''
 
 import logging
-import logging.handlers
 import signal
 import json
-import hostname
-import sys, traceback
+import sys
 import time
 import threading
 import urllib2
-from urllib2 import Request, urlopen, URLError
-import httplib
-import ssl
-import AmbariConfig
 import pprint
+from random import randint
+
+import hostname
+import AmbariConfig
 import ProcessHelper
 from Heartbeat import Heartbeat
 from Register import Register
 from ActionQueue import ActionQueue
-from optparse import OptionParser
-from wsgiref.simple_server import ServerHandler
 import security
 from NetUtil import NetUtil
-from random import randrange, randint
+
 
 logger = logging.getLogger()
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Hardware.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Hardware.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Hardware.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Hardware.py Fri Apr 19 16:21:56 2013
@@ -18,16 +18,15 @@ See the License for the specific languag
 limitations under the License.
 '''
 
-import multiprocessing
-import platform
-import AmbariConfig
 import os.path
-import shell
 import logging
 import subprocess
 import pprint
 import traceback
 
+import AmbariConfig
+
+
 logger = logging.getLogger()
 
 class Hardware:

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py Fri Apr 19 16:21:56 2013
@@ -20,17 +20,15 @@ limitations under the License.
 
 import json
 import logging
-from Hardware import Hardware
+import time
+from pprint import pformat
+
 from ActionQueue import ActionQueue
-from ServerStatus import ServerStatus
-import NetUtil
 import AmbariConfig
 import hostname
-import time
-import traceback
-from pprint import pprint, pformat
 from HostInfo import HostInfo
 
+
 logger = logging.getLogger()
 
 firstContact = True

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py Fri Apr 19 16:21:56 2013
@@ -22,10 +22,6 @@ import json
 import logging
 from StatusCheck import StatusCheck
 import AmbariConfig
-import socket
-import time
-import traceback
-from pprint import pprint, pformat
 from StackVersionsFileHandler import StackVersionsFileHandler
 from ActualConfigHandler import ActualConfigHandler
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/NetUtil.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/NetUtil.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/NetUtil.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/NetUtil.py Fri Apr 19 16:21:56 2013
@@ -14,12 +14,9 @@
 # limitations under the License.
 
 
-from httplib import HTTPS
 from urlparse import urlparse
 import time
 import logging
-import pprint
-import traceback
 import httplib
 
 logger = logging.getLogger()

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py Fri Apr 19 16:21:56 2013
@@ -21,13 +21,15 @@ import json
 import os.path
 import logging
 import subprocess
+import pprint
+import threading
+from threading import Thread
+
 from manifestGenerator import generateManifest
 from RepoInstaller import RepoInstaller
-import pprint, threading
 from Grep import Grep
-from threading import Thread
 import shell
-import traceback
+
 
 logger = logging.getLogger()
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py Fri Apr 19 16:21:56 2013
@@ -17,14 +17,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
-import os.path
 import logging
 import subprocess
-import pprint, threading
-from Grep import Grep
+import pprint
+import threading
 from threading import Thread
+from Grep import Grep
 import shell
-import traceback
+
 
 logger = logging.getLogger()
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Register.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Register.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Register.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Register.py Fri Apr 19 16:21:56 2013
@@ -18,15 +18,11 @@ See the License for the specific languag
 limitations under the License.
 '''
 
-import sys, os
-import json
-from Hardware import Hardware
-from ActionQueue import ActionQueue
-from ServerStatus import ServerStatus
-import hostname
+import os
 import time
-import urllib2
 import subprocess
+from Hardware import Hardware
+import hostname
 from HostInfo import HostInfo
 
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/RepoInstaller.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/RepoInstaller.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/RepoInstaller.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/RepoInstaller.py Fri Apr 19 16:21:56 2013
@@ -21,13 +21,12 @@ limitations under the License.
 import logging
 import os
 import json
+from pprint import pformat
+import ast
 from shell import shellRunner
 from manifestGenerator import writeImports
-from pprint import pprint, pformat
-import ast
 import AmbariConfig
-import urlparse, urllib
-import re
+
 
 PUPPET_EXT=".pp"
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StackVersionsFileHandler.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StackVersionsFileHandler.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StackVersionsFileHandler.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StackVersionsFileHandler.py Fri Apr 19 16:21:56 2013
@@ -20,11 +20,7 @@ limitations under the License.
 
 import os.path
 import logging
-import subprocess
-import pprint, threading
-from Grep import Grep
-from threading import Thread
-import shell
+import threading
 import traceback
 import shutil
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StatusCheck.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StatusCheck.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StatusCheck.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/StatusCheck.py Fri Apr 19 16:21:56 2013
@@ -18,13 +18,12 @@ See the License for the specific languag
 limitations under the License.
 '''
 
-from shell import shellRunner
 import logging
-import logging.handlers
-import sys
 import os
 import re
 import string
+from shell import shellRunner
+
 
 logger = logging.getLogger()
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/UpgradeExecutor.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/UpgradeExecutor.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/UpgradeExecutor.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/UpgradeExecutor.py Fri Apr 19 16:21:56 2013
@@ -20,17 +20,11 @@ limitations under the License.
 import json
 import os.path
 import logging
-import subprocess
-from manifestGenerator import generateManifest
-from RepoInstaller import RepoInstaller
-import pprint, threading
-from Grep import Grep
-from threading import Thread
-import shell
-import traceback
+import pprint
+import re
 from Grep import Grep
 from StackVersionsFileHandler import StackVersionsFileHandler
-import re, json
+
 
 logger = logging.getLogger()
 grep = Grep()

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/__init__.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/__init__.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/__init__.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/__init__.py Fri Apr 19 16:21:56 2013
@@ -30,10 +30,3 @@ __author__ = [
 __license__ = "Apache License v2.0"
 __contributors__ = "see http://incubator.apache.org/ambari/contributors"
 
-import logging
-import logging.handlers
-import threading
-import sys
-import time
-import signal
-

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/hostname.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/hostname.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/hostname.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/hostname.py Fri Apr 19 16:21:56 2013
@@ -20,8 +20,9 @@ limitations under the License.
 
 import socket
 import subprocess
-import AmbariConfig
 import urllib2
+import AmbariConfig
+
 
 def hostname():
   config = AmbariConfig.config

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/main.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/main.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/main.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/main.py Fri Apr 19 16:21:56 2013
@@ -20,21 +20,21 @@ limitations under the License.
 
 import logging
 import logging.handlers
-import code
 import signal
 from optparse import OptionParser
-import sys, traceback
+import sys
+import traceback
 import os
 import time
 import ConfigParser
 import ProcessHelper
-from createDaemon import createDaemon
 from Controller import Controller
 from shell import killstaleprocesses
 import AmbariConfig
 from security import CertificateManager
 from NetUtil import NetUtil
 
+
 logger = logging.getLogger()
 agentPid = os.getpid()
 
@@ -136,7 +136,6 @@ def main():
     sys.exit(1)
   else:
     # Daemonize current instance of Ambari Agent
-    #retCode = createDaemon()
     pid = str(os.getpid())
     file(ProcessHelper.pidfile, 'w').write(pid)
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py Fri Apr 19 16:21:56 2013
@@ -21,13 +21,12 @@ limitations under the License.
 import json
 import os.path
 import logging
-from uuid import getnode as get_mac
-from shell import shellRunner
 from datetime import datetime
-import AmbariConfig
 import pprint
+import AmbariConfig
 import hostname
 
+
 logger = logging.getLogger()
 
 non_global_configuration_types = ["hdfs-site", "core-site", 

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/security.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/security.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/security.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/security.py Fri Apr 19 16:21:56 2013
@@ -18,17 +18,17 @@
 
 import httplib
 import urllib2
-from urllib2 import Request
 import socket
-import hostname
 import ssl
 import os
 import logging
 from subprocess import Popen, PIPE
-import AmbariConfig
 import json
 import pprint
 import traceback
+import hostname
+import AmbariConfig
+
 logger = logging.getLogger()
 
 GEN_AGENT_KEY="openssl req -new -newkey rsa:1024 -nodes -keyout %(keysdir)s/%(hostname)s.key\

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/shell.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/shell.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/shell.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/shell.py Fri Apr 19 16:21:56 2013
@@ -19,10 +19,7 @@ limitations under the License.
 '''
 
 from pwd import getpwnam
-from grp import getgrnam
-import AmbariConfig
 import logging
-import logging.handlers
 import subprocess
 import os
 import tempfile
@@ -31,7 +28,8 @@ import sys
 import threading
 import time
 import traceback
-import shutil
+import AmbariConfig
+
 
 global serverTracker
 serverTracker = {}

Modified: incubator/ambari/trunk/ambari-agent/src/test/python/TestActionQueue.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/test/python/TestActionQueue.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/test/python/TestActionQueue.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/test/python/TestActionQueue.py Fri Apr 19 16:21:56 2013
@@ -21,7 +21,6 @@ limitations under the License.
 from unittest import TestCase
 from ambari_agent.ActionQueue import ActionQueue
 from ambari_agent.AmbariConfig import AmbariConfig
-from ambari_agent.FileUtil import getFilePath
 from ambari_agent.UpgradeExecutor import UpgradeExecutor
 from ambari_agent.StackVersionsFileHandler import StackVersionsFileHandler
 import os, errno, time, pprint, tempfile, threading

Modified: incubator/ambari/trunk/ambari-agent/src/test/python/TestAgentActions.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/test/python/TestAgentActions.py?rev=1469941&r1=1469940&r2=1469941&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/test/python/TestAgentActions.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/test/python/TestAgentActions.py Fri Apr 19 16:21:56 2013
@@ -19,13 +19,7 @@ limitations under the License.
 '''
 
 from unittest import TestCase
-import os, errno, getpass
-from ambari_agent.ActionQueue import ActionQueue
-from ambari_agent.AmbariConfig import AmbariConfig
-from ambari_agent.FileUtil import getFilePath
-from ambari_agent import shell
-from ambari_agent.shell import serverTracker
-import time
+
 
 class TestAgentActions(TestCase):
 #This feature is not yet implemented in ActionQueue