summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks/smb_nfs/task.py
diff options
context:
space:
mode:
authorgasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2014-12-17 18:18:53 +0000
committergasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2014-12-17 18:18:53 +0000
commit7512e2c7555c6e3536e1bcb6b3a328d4e9aced77 (patch)
tree19d0fd22d4b19a3d240191e896f2fe9d57ab9863 /kpov_judge/tasks/smb_nfs/task.py
parent3d5dfa916fef693611a7857f01174e6a39148f01 (diff)
Added some comments/instructions in the task.py files, answered some questions in DEVELOPMENT-FAQ.txt
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@95 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
Diffstat (limited to 'kpov_judge/tasks/smb_nfs/task.py')
-rw-r--r--kpov_judge/tasks/smb_nfs/task.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/kpov_judge/tasks/smb_nfs/task.py b/kpov_judge/tasks/smb_nfs/task.py
index a586e33..8fd97e7 100644
--- a/kpov_judge/tasks/smb_nfs/task.py
+++ b/kpov_judge/tasks/smb_nfs/task.py
@@ -16,9 +16,6 @@ datoteke iz imenika MAPA (ta mapa naj vsebuje datoteko z imenom SHARED_FILENAME
Naloga za studenta, ki pise gen_params() in params_meta je da nazreba opisane parametre.
V task() napisi zaporedje ukazov, ki bodo preverili, ali je student res postavil delujoca streznika NFS in SMB in ali je nanju postavil datoteko SHARED_FILENAME. Vecina logike te funkcije gre v task_check.
Izpis teh rezultatov spravi v results. Naloga student, ki pise task_check(results, params) je da napise funkcijo, ki pregleda ustvarjeni results in pove, ali je student opravil nalogo v skladu z navodili.
-
-
-
""",
'en':u"""
@@ -81,6 +78,7 @@ def task(SMB_NAME, NFS_MOUNT, SHARED_FILENAME, SHARED_FILENAME_CONTENT):
# Naslov, na katerem se nahaja streznik.
address = SMB_NAME
+ # TODO: (polz) Try using pexpect instead of subprocess, it's much nicer.
# Tabela vseh mountov.
mounts = subprocess.check_output("mount").split("\n")
# Samo mounti na streznik.
@@ -93,6 +91,8 @@ def task(SMB_NAME, NFS_MOUNT, SHARED_FILENAME, SHARED_FILENAME_CONTENT):
# example: ["//192.168.1.92/srv/samba on /mnt/samba type cifs (rw)", ... ]
# Seznam mora imeti vnos za NFS in SMB, morata biti obesena na pravo pot in (rw)
# ++ PIKE za namountan SMB/NFS
+ # TODO: (polz) prej ali slej tole kodo premaknite v task_check, v results pa porinite
+ # le mounts (npr. results['mounts'] = mounts
for m in srvmounts:
# Dobimo pot, filesystem in pravice iz mounta:
split = m.split()