mirror of
https://github.com/clearlinux/WALinuxAgent.git
synced 2026-09-02 11:51:46 +00:00
Steven Luther
8b53e8e4b8
* add testing for mountpoint, some refactoring
* fixed double space in mount string
* patch for ConfigProvider
* revert patch to original string.
* update documentation, add 'n' option for mountopts
* remove test argument
* More descriptive description in README, n to None
* minor var name changes for clarity
* spacing, missing self in get_mount_string
* mount_opts to mount_options
* add config option to writtet WaagentConf, minor style changes.
* mount options fix, is not Note
* add self to get_mount_string args
* self to function, not where it's called
* mount_options = output of function, not the function.
* get_mount_string returns with mount options/if not none
* forgot to remove part of the string
* instantiate resource disk handler, get_switch to get in conf.py
* Added config option to waagent.conf
* minor style fixes
* mountOpts is None change, and also added removed variable.
* revert changes to bin/waagent2.0
* reverted waagent2.0 to e8c641f
* config options added
44 lines
1.6 KiB
Python
44 lines
1.6 KiB
Python
# Copyright 2014 Microsoft Corporation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
# Requires Python 2.4+ and Openssl 1.0+
|
|
#
|
|
|
|
from tests.tools import *
|
|
from azurelinuxagent.common.exception import *
|
|
from azurelinuxagent.daemon import *
|
|
from azurelinuxagent.daemon.resourcedisk.default import ResourceDiskHandler
|
|
|
|
class TestResourceDisk(AgentTestCase):
|
|
def test_mount_flags_empty(self):
|
|
partition = '/dev/sdb1'
|
|
mountpoint = '/mnt/resource'
|
|
options = None
|
|
expected = 'mount /dev/sdb1 /mnt/resource'
|
|
rdh = ResourceDiskHandler()
|
|
mount_string = rdh.get_mount_string(options, partition, mountpoint)
|
|
self.assertEqual(expected, mount_string)
|
|
|
|
def test_mount_flags_many(self):
|
|
partition = '/dev/sdb1'
|
|
mountpoint = '/mnt/resource'
|
|
options = 'noexec,noguid,nodev'
|
|
expected = 'mount -o noexec,noguid,nodev /dev/sdb1 /mnt/resource'
|
|
rdh = ResourceDiskHandler()
|
|
mount_string = rdh.get_mount_string(options, partition, mountpoint)
|
|
self.assertEqual(expected, mount_string)
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|